Fix crash when changing from expansion 1 to 2