Fixed a bug pertaining to -s option.