field traversal fixes pointed out by xoyojank@gmail.com