Fix double event