fixing NA problems

latest commit b4afd45d2a
Chris Clark chrisclark authored