Fixed the time ordering issue.