LP1751800 - fix fields fields reversing