re #6485 wikimaker fixes