Fix stubs problem due to merge