Fix for #98