Fixed issue 445