Fixing logic to persist RPCore