Kuan/Edwin - fix bug