Fixed issue 146241