Fixed problem with empty's fields