update according to 4.0.2 changes