#5428 an attempt at a better fix