Moved r_x to same line as null check in field write