Closes #925