try to fix bug 24