fixed merge for #3527