changed implementation for -s with the correct one