Fixing If Issue