Fix for new org-mode.