Partial fix for items not loading in order