fix bug 1 2