bugfix for OC-11575