Code

Patch by Johan for 445790