Ashwin | #2956 | Fixing drag and drop.