Fix the issue mentioned in PR #186