Abstract service fix