Closes #1213