Fixed extract fields