closes #435