ugly bugs correction in the last version