Logic fix, followup to c02c11d