Closes #1463