r208: Added Bernard Jungen's patch: