Fixed issue #61