Bugfix: nesting bug