Closes #582

Closes #582