Fix to issue #123