XE 19.1 fix

Update and fix.