Fix to issue #94