Fixing references mismatch