FIX: fixed distribution management