Issue #5703: Fix bug

Issue #5703: Fix bug