Fixing CARBON-15046

Signed-off-by: Jayanga Dissanayake <jsdjayanga@yahoo.com>