4.2 fix