closes #461