Tentative fix for out of order json