Fix for #79
1.4.0.RC2