Fixed #7 on lab1