Fixed issue #41