Improved some logic in do_force