- Fix Bug #9427