fix

rework of the first problem