Circular saw fix

Fixes #7608