Added test of  workaround in for issue #1616.