Closes #1341