Fixed completion for -s option