Button fires events correctly now