Fix the issue #16