Bug fix: forgot to handle 'self' case when generating example data