fixed up maintenance handling