s: now correct, api change is coming