Fix BYOI