Fix tool save