Fix issue 4045