Fix crash [delivers #80972726]