Closes #553.

#553