Fixed toBuffer, rebuild, #2 ?