Closes #651

#651