Fixed issue #