Fix for .NET 3.5 API