Closes #541

#541