Bounds fix, still has out-of-order issue