Fixing references again...?