Make sure ss and sy are used from the dataset when they are present

Make sure ss and sy are used from the dataset when they are present #595