Fix for 572#pullrequestreview-941611
Fix for 572#pullrequestreview-941611

daneshk/carbon-store,jeradrutnam/carbon-store,jeradrutnam/carbon-store,cnapagoda/carbon-store,madawas/carbon-store,splinter/carbon-store,wso2/carbon-store,wso2/carbon-store,jeradrutnam/carbon-store,madawas/carbon-store,splinter/carbon-store,daneshk/carbon-store,madawas/carbon-store,daneshk/carbon-store,wso2/carbon-store,splinter/carbon-store,cnapagoda/carbon-store,cnapagoda/carbon-store