Lamps overlay finally fixed!