Closes #1208