Checked in by Rudy Xiong for bug fix