fixup --start-with logic