Add --keep option to goto