defer fixes in force.go