Fixing callout generation