Fixed a bug with the guard service.