Fixed recursive $$ references