Further fix on out of sequence bug