Closes #574

#574