SUP-13373: fix from code review
SUP-13373: fix from code review

kaltura/server,DBezemer/server,DBezemer/server,DBezemer/server,DBezemer/server,DBezemer/server,kaltura/server,kaltura/server,DBezemer/server,kaltura/server,DBezemer/server,kaltura/server,DBezemer/server,kaltura/server