Query12 fix