Fix for #42