Fix for roslyn changes - part 2