fixed tpye mismatch line 59