Attempt to fix event catching