Fix issue where RTE was instantiated again on RTE TVs after save