Closes #555

#555