Fix 'doubled code'