Closes #758