Crm 13234 -fix for observed failure