Fixed merge conflict for #1456