Fix for lamps direct control