Fix force option...