once more, now with feeling. Closes #424
Merge branch 'issue-424-bugfix' into develop