working on ReSharper 8 migration