Issue #308 followup: N/A was based on the wrong thing