Fixing fetching logic