fixed empty fields bug