Fix to issue #135