Fixed lines 48 through 51