Fix keyword detection