Fix the garbo wrapper