Fixed Key Capture issue