Fixed merge conflict for #1329