bug fixing for B2B connector