Fixes "Nesting level too deep - recursive dependency?"