WSOTWO-126: Small improve