Record Id Fix