4.2.2 fix up