Fixes #21 bug during parsing when List/Set/Map values are parameterized types