kuan -  bug fixed