Better fix for #10
0.15.3