SS-1013 fix for not substituting variables during validation