Local service fix