Closes #1206