Fixing Auth restriction problem