Fixing the circular referencing