Fixed issue with not getting proper values