Closes #1122