closes #628