fix to lines 31, 32