Fixed a bug with guarded