WIP: lamps dirtyfix