[#0017022] Fix order in arrays