COOPR-629
generic fix