finally fix user