Closes #1133