Fixing pet solutions and autoweek