#20 fix for work with .net 4.0