fix bug 40