Fixing CARBON-14819. Patch by Jayanga