Fix to issue #6