fixed if not else