Fix for #77