Fixed issue #80