Closes #1111