Removed the fixname hack.