Closes #1137