Fixed empty entries being created