Lab 6 fix