Fixing referances