LQE-253: some remake