Second part to charger.c fix