fixed merge for #3721