fixing CARBON-14995 provided by Amani
Merge pull request #29 from arunasujith/CARBON-14995

fixing CARBON-14995 provided by Amani