Fixed reference handling