if expression fix