fix for CB-5534