Fix #1049 by adding a workaround (until Roslyn issue is fixed)

Fix #1049 by adding a workaround (until Roslyn issue is fixed) #646