Closes #600.