fixing bug 21