fixed merge for #3165