Fix to issue #77