Closes #1374