Fixed options check