Logic fix change