Workarounf for tools.js and changes by cluster buffer