Statefull service fix