Fix go handling