IDEX-1708: siplified code