Code

Patch by Johan to fix 391368