Closes #732