Fix double events