prosed fix for CRM-13428
Merge pull request #1670 from systopia/CRM-13428

prosed fix for CRM-13428