fixing bug 19