fix bug 29/5