Bugfix attempt: crash with Choco
Further attempt to fix the ChocoIG bug