Fixed user mapper bug