fixed merge for #3386