fix bug 2-28