Fix options checking