Fixing wrong behaviour in dragdrop classes