cleanup, better double charge detection