WSOTWO-87: Fixed bug with creating and moving elements