WSOTWO-120: improved desearilization mechanism