Fix for #79
0.5.2