fix huge bugs of -s option