Fix the bug-2