fixed empty field handling