WSOTWO-87: Fixed bug with moving elements