Fixed compatibility pbs with official samples