Fixed issue with order row field sometimes missing