[sorvani]

Unless/until someone can figure that out I have committed a fix in rev 2221 that disables optimization for just the one section of code that causes this problem.