Applied DIFF from Nivanka

Applied as fix for (https://www.wrike.com/open.htm?id=24357728)