Let's port the PBR fix over for show/hide
Let's port the PBR fix over for show/hide