Fix regression caused by PHOENIX-3341
2 files changed