Issue 5512 fix.