fixed bug
generalized user