Closes #735