Fix the issue #17