Fix drag and drop to be targetting