Fixed issue with wrong charges