Maybe a ternary operator here ? (again :-))