Fixed Errors on lines 72-77 & 132-134

Fixed Errors on lines 72-77 & 132-134 (See Comments)