closes #636