Fixed merge conflict for #1294