Closes #1308