Fixed for destroy of service