try to fix issuess #160