Remove ternary condition to fix compatibility issues