Fixed bug with side-selection