flickering lights, fixing bug #354