Fix bug #67436