Fixed issue #59