fix ISSUE #76