Fixing the choco bug