Bug fixed

Change-Id: I77b36394d34c8a2a6515f21e90ed3165271ca9ca
Signed-off-by: taoman89 <juntao.zhu.2010@sis.smu.edu.sg>