fix guard bug