More fixing of intensity issue