extends fixes
0.0.17