fixed the bug 2