I've reported the following bug earlier:
http://article.gmane.org/gmane.emacs.orgmode/72967

Here's a fix, attached.