fixed the bug 960