fixed merge for #3600