Fixed issue #60