James - fixing the indirect refrances so that they are Bourne'able