Fixed whileusingAuth