fixed double NA detection and propagation, likely also to improve performance