Fix User Interaction