fix empty data problems by Gao Chunhui