Fix for #84.