Bulbs bug fix