Fix to issue #7.