Improved Force Add / Fixed Stop bug