FIX : fix for #101