try to fix issuess #160

It seems works well