Fixed issue #47