Closes #417

#417