This fixes bug #22024.