WSOTWO-138: Fixed problem with cursor