Fix for #81
1.4.0.RC3