Fix for CB-4521