Fix for #101.