Fix 1st and 2nd chapter