Bugfix attempt: crash with Choco