be more defensive
4.0.5