topology fixing (not 100%)
WOW that was a subtle bug