Fix to issue #71