Fix issue with certain inputfields in PW < 2.3