[Fixed] Stability Issue