Fixed control responsiveness issue