CARBON-14927 fixed