Fix #199 improve force behavior