Fix to issue #2.