Closes #526

#526