closes #458