Fix to advanced options check