Fixing refernences