LP1852782 Prevents data fields swapping to control fields