Closes #1170