diff --git a/VERSION b/VERSION
index a73c7d74..eae29d16 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.7 (2012-05-03 18:48:09) dev
+Version 1.99.7 (2012-05-03 19:00:32) dev
diff --git a/gluon/contrib/autolinks.py b/gluon/contrib/autolinks.py
index 2ceb4544..8e7c1e21 100644
--- a/gluon/contrib/autolinks.py
+++ b/gluon/contrib/autolinks.py
@@ -145,7 +145,10 @@ def expand_one(url,cdict):
         r = oembed(url)
     # if oembed service
     if 'html' in r:
-        return '<embed style="max-width:100%%">%s</embed>' % r['html']
+        if r['html'].startswith('<object'):
+            return '<embed style="max-width:100%%">%s</embed>' % r['html']
+        else:
+            return r['html']
     elif 'url' in r:
         url = r['url']
     # embed images, video, audio files