Fix the bug for QE 538