Fix issue 1123