fixed usertracking