Bug fix on drag/drop move