guard bug fixed