Fix 'by' stripping