Fix issue #100