Fix Refresh Flow