fixing CARBON-14991 provided by amani
Merge pull request #25 from arunasujith/master

fixing CARBON-14991 provided by amani