Fixed problems during drag & drop
Fixed problems during drag & drop