fix for CB-5265