#33, fix for mouse