further tweak to pbuffer support