Swap your tools and one-handed weapons back and forth only thing I’ve found to help.