closes #417