fix bug 5 6 10