correction of last bugs
correction of last bugs