Mouse control final fix