Fixed according to EranK code review
Merge pull request #1200 from kaltura/IX-9.16.0-PLAT-1267-review

Fixed according to EranK code review