got rid of weird event bug