Adjust ternary to include subject in else as well