Fixed a conflict between .NET 4.0 and 4.5