Fix for #101