Fixed issue #384