fixed changeSet and load resolving