Closes #592

#592