FIX: Incorrect string match