WSOTWO-97: Fixed selection bug