Fixed events properly