IAAS-2197_fix_drag_&_drop_areas