Potential fix for tools-38