Changes order product position handling to avoid deadlocks