Fix for #97