closes #465