FOO

* fix bug 1011243
* fix bug  965828
* fix bug  926673