Fixes #857, #392 - also closes #700