additional case handle of all NA columns closes #493