Fixed issue #39