Fixed issue with #178 and #14 fix because it wouldn't compile under .NET 3.5.