more guard fixing