fix ISSUE #50 part 2