closes #430