Buddy fix2