Fixed SOE with stubs.