Fix for XP support