Fix for PHOENIX-1077 in main branch (fixed by Kyle Buzsaki)