Fix the issue #26