Bug 416 Fix

Signed-off-by: Yu Xin Huo <huoyuxin@linux.vnet.ibm.com>