Fix for #107