Bug free version of bundle injection routine