fix to prevent double fetch