Fix: Elements that reference themselves
Fix alternative calling style