added fix for Collection types.