Code Fix: Rise Client Source