bug fix with data processing

Reviewer: raymond