Partial Bug fixed for drag n drop