Fix event calls