core-3956  fix tool saving issue