fixed merge for #3301