Fixed drag n drop crash