Better fix for LastWiki