Fix: modify for dist