Fixing .NET 4 issue