Fixing assignment 2