Modify swallow_id call