Issue: if condition fix.