OOIION-1482 : Bug fix for spacial case of dealing with out of order data