Adjust for pbr >= 0.6