Close #94 - XP field fixed