fix issuess #160