Fix options check again