fix again after 4.0.4 merge