Fix to issue #4