Updated for compatibility with Org 8.1.