Fix guard

Change-Id: Idec944ca36401dcba0a71f52b38abd7ca1f2f60c