a bit more defensive
0.2.2