work towards 4.0.4