fixed empty field check