fix for variable expansion in parameterized class