Somewhat less hacky fix to the French l''''homme''' problem.