[DF-708] Fixed Guard