Fix for XP12.1.x