Closes #1199