Fix the --start-with option