kuan - fixing bug 3014