Fixed issue breaking the drag/drop feature