Fix guard bug