OSC-15 fix invalid topology issue