Fixed minor issue with multi-selection