closes #457