fix issue #5 completly