Lab 7 fix