Fix same as in 2.4: #114