fixes [#65843836]