fixed merge for #3497