Fix for #84