FIX: extended the conditional expression to fully match the original behavior.