better handling of na