Fixed issue #100