#13 Attempt to get rid of the double charge issue