Correct tracker issue #5272

See tracker issue #5272