Closes #580

#580