Fix Referencing Loop