Correct tracker issue 5320

See tracker issue #5320