applied patch for CRM-12673
Merge pull request #866 from kurund/CRM-12673

applied patch for CRM-12673