Closes #1332