Initial fix for CB-5747