Second fix for #101