Fix buggy multi selection