Bugfix: picking up 2-groups works correctly when OrientationMatters == false