Fixed issue when stopping while stopped