Fixed problem of empty fields