Temporary persistence workaround