Solar fix + Buff