Drop and drag save fix