Test and quick fix #5847

Test and quick fix #5847