fixed empty fields