Closes #745