Closes #1226