Charge & Discharge of items is now done correctly.