Fixed error at line 113 and 117