Restore a code snipped overriddent by leon