bug fix

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

thanks for you comments, @vigsterkr 
seems like your getting active again :)