Fixed issue #45