fixed before auth