Quality of life fix