Replace conditional with….

…by Luca Minudel!