Fix for noncharged systems.