Assignment 2 fix