Fixed Lab1-2