Fixing destination when not specified