Another attempt to fix !wir without user bug.