Updated jockeyed charger fix

Now checks validity of the charger to exclude some undesired effects