Fixed issue #44