Closes #1143