Logic fix, additional details