CB-6357 (fix latent bug)