improve Dexterity support