Merge "Fix auth error"