Patch: I take all the blame

I'm sorry for these, I tested them not good enough appearently, however
these will be triple tested.