Return to setting NAs in similar

Fixes #10, #20, closes #21