Fix Issues #62 #65