Back to old scheme, commit-fixed