diff --git a/src/win/window.rs b/src/win/window.rs
index 04607df..944a012 100644
--- a/src/win/window.rs
+++ b/src/win/window.rs
@@ -77,10 +77,13 @@ unsafe extern "system" fn wnd_proc<H: WindowHandler>(
             WM_MOUSEMOVE => {
                 let x = (lparam & 0xFFFF) as i32;
                 let y = ((lparam >> 16) & 0xFFFF) as i32;
-                window_state
-                    .borrow_mut()
-                    .handler
-                    .on_event(&mut window, Event::CursorMotion(x, y));
+                window_state.borrow_mut().handler.on_event(
+                    &mut window,
+                    Event::Mouse(MouseEvent::CursorMoved {
+                        x: x as i32,
+                        y: y as i32,
+                    }),
+                );
                 return 0;
             }
             WM_TIMER => {
@@ -94,7 +97,7 @@ unsafe extern "system" fn wnd_proc<H: WindowHandler>(
                 window_state
                     .borrow_mut()
                     .handler
-                    .on_event(&mut window, Event::WillClose);
+                    .on_event(&mut window, Event::Window(WindowEvent::WillClose));
                 return DefWindowProcA(hwnd, msg, wparam, lparam);
             }
             _ => {}