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