Closes #1350