Fix Regression caused by Fix of Bug423106

Signed-off-by: Pengcheng Bian <pbian@actuate.com>