Gnavi bug fixed
Gnavi bag fixed