bug fix

@vigsterkr 

Sorry for my mistake.
I forgot to record all the change in the previous PR.

this i find very-very bad way to do things.