Closes #585

Closes #585