Fix 'Bucket is' -> 'I am' conversion.