Fixed final destination issue