Fix issue 1461