Fix the issue#56