Modification done for risk th fetching logic and its now fixed