Bug #11742 correction.

Bug #11742 and Pull request #558 can be closed when merged.