COOPR-625: improve fix