issue-#11

rework _nextField logic that was overcomplicated