Closes #1102