Fix bug with NA defaults