Closes #737