Fix for 811

Closes #811