fix issue #10 and issue #17