Fixed disappearing charges, see #50 #51