Fixed for HW4