Closes #582

#582