Fixes #568
Fixes #568
Merge pull request #579 from RyanPepley/issue473

Fixes #568