Changed logic issue