Code

Patch by theAdib which fixes 397075