Fixed bug that mentioned in issue #116