[#51348451] fixed bad data ordering