some fix ISSUE #76