4.3 fix up