Fix bug #58664