Fixed event hanling.