changed 20130521 for reslove build error