Fix double service