Bug cl#5196 - PE: Check values after expanding templates