fix bad merge
Merge pull request #3663 from euforic/timob-11794

fix bad merge for [#TIMOB-11794]