Fix Buchi issue