CE-107857-8 fix