Closes #552

#552