fixed some events not correctly recognized