added s switch for fix