commit before I manage to screw it up
Added a hack to fix event drag n drop freezing