868 for master

Resolves #868 for master