Fix backward -s logic