Fix issue 1 - duplicate nested types