Fixed performance issue
Disable force now