Service map fix