23 fixed user issues