Bug fix in presentation mode