Fix for Collection return types