service: Another fix