Fixed Normal charge mode instantly charging

Also, please do mind, that there are some unfinished/unimplemented
changes that will come later, as I might need some changes to gamma as
well now that I think of it.
The fix was just important enough to push now, is what I thought.