try to fix bug 1