fixed -s stuff