na.rm more often to help avoid situations like #59

na.rm more often to help avoid situations like #59 #154