Added early bailout for fixing references