fixed merge for #4214