try to fix bug 7