Issue 31432

Fix for the issue 31432