Fix Fetch Data

Fix Fetch Data