Closes #601

#601