Major bug fix for 1st year exercises