Improved iso-root handling