Fixes ticket #9007