guard bug fix