Rework fixing Bug#24432