Fixed HW #9