Fix functions cross ref :bug: