fix ISSUE #50