Fix bug#16609