Fixed issue 1120