Fixes internal organ processing

Fixes  #5588 among other things.