A safer tweak to reduce time losses

Suggested by Alexandre Meirelles

bench: 3884409