Fixed up bulb carrying logic