Fix issue 1516