simplify code for #11
0.10.0