Fix minor issue for fetch data