Fix for function for s