Key CallBack fix