fix for #15 rearranged
0.12.5