Fixed lines 27 through 32