Correction of few little bug