fixing NA problems