Closes #586

#586