Re-employed the temp workaround for records