Closes #1360