Solar fixes