Improve force handling