Bug correction.

need to clean my code, later...