Fixed EEM charge generation.

Change-Id: I61e8b0e908d5b69756099b18216dd5aadad86198