Fix bug#16826