Closes #1361