Code

Patch by Johan to fix 365903.