Fix for the mouse event data being passed to the model