Closes #752