finally fixed that fucking drag and drop bug