Fix a problem in the way the force option was handled