Fix to issue #8