Fixing bad merge for #1478