bugs correction.