Closes #1157