patched CRM-13077
Merge pull request #43 from kurund/CRM-13077

patched CRM-13077