Fixes service-assertion