fix bug 34-35