Fix for #103