LQE-210: Fixed